bitkeeper revision 1.1159.123.7 (41781cf1F6-IOsb_NFEj5dxv6WFBCA)

Merge labyrinth.cl.cam.ac.uk:/auto/groups/xeno/BK/xeno.bk
into labyrinth.cl.cam.ac.uk:/auto/anfs/scratch/labyrinth/iap10/xeno-clone/xeno.bk

diff --cc tools/python/xen/xend/XendDomainInfo.py
index 031b1a4143fe4e3eaad86daf917ea81f6d06bbc0,2ed518035544bb327f90a7052a7a034f3ee57446..24eb513e754528df7108924ed93e4f3a0047225f
--- 1/tools/python/xen/xend/XendDomainInfo.py
--- 2/tools/python/xen/xend/XendDomainInfo.py
+++ b/tools/python/xen/xend/XendDomainInfo.py
@@@ -236,9 -217,10 +217,10 @@@ def vm_recreate(savedinfo, info)
      if config:
          d = vm.construct(config)
      else:
 -        vm.name = sxp.child_value(savedinfo, 'name')
 +        vm.name = sxp.child_value(savedinfo, 'name', "Domain-%d" % info['dom'])
          d = defer.succeed(vm)
      vm.recreate = 0
+     vm.savedinfo = None
      return d
  
  def vm_restore(src, progress=0):